Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[8.16](backport #42569) metricbeat: Update beat module with apm-server tail sampling monitoring metrics fields #42573

Merged
merged 2 commits into from
Feb 3, 2025
Merged

[8.16](backport #42569) metricbeat: Update beat module with apm-server tail sampling monitoring metrics fields #42573

merged 2 commits into from
Feb 3, 2025
+293 −56

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 3, 2025

Proposed commit message

Update metricbeat beat module mapping to add back missing apm-server tail sampling montioring metrics fields.

The fields were missed in #40127

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

  • Start apm-server with monitoring
  • Start standalone metricbeat with beat module
  • Confirm that fields are mapped correctly in metricbeat-* data stream

Related issues

Use cases

Screenshots

Logs

This is an automatic backport of pull request #42569 done by [Mergify](https://mergify.com).

@carsonip @mergify
metricbeat: Update beat module with apm-server tail sampling monitori…
22868e4 
…ng metrics fields (#42569)

Update metricbeat beat module mapping to add back missing apm-server tail sampling montioring metrics fields.

The fields were missed in #40127

(cherry picked from commit 9134522)

# Conflicts:
#	metricbeat/module/beat/fields.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 3, 2025
@mergify mergify bot requested a review from a team as a code owner February 3, 2025 20:43
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Feb 3, 2025

Cherry-pick of 9134522 has failed:

On branch mergify/bp/8.16/pr-42569
Your branch is up to date with 'origin/8.16'.

You are currently cherry-picking commit 9134522bc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   metricbeat/docs/fields.asciidoc
	modified:   metricbeat/module/beat/_meta/fields.yml
	modified:   metricbeat/module/beat/stats/_meta/fields.yml
	modified:   metricbeat/module/beat/stats/_meta/test/apm-server.stats.712.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/module/beat/fields.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 3, 2025
@botelastic
Copy link

botelastic bot commented Feb 3, 2025

This pull request doesn't have a Team:<team> label.

@carsonip carsonip enabled auto-merge (squash) February 3, 2025 21:41
@carsonip carsonip merged commit 48f2ed7 into 8.16 Feb 3, 2025
32 checks passed
@carsonip carsonip deleted the mergify/bp/8.16/pr-42569 branch February 3, 2025 22:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carsonip carsonip carsonip approved these changes

Assignees

@carsonip carsonip

Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@carsonip